buffering issue solved